Detect freetype properly Make use of above.

* configure.in: Detect freetype properly
* modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.

diff --git a/ChangeLog b/ChangeLog
index b10aac88b3a25331abfcaa84642620ba20f62fa7..19a41dd5fdd5c7ed9b8de2e6b4ddaaf9fb9f183b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-06  Elliot Lee  <sopwith@redhat.com>
+       * configure.in: Detect freetype properly
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/Makefile.am:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b10aac88b3a25331abfcaa84642620ba20f62fa7..19a41dd5fdd5c7ed9b8de2e6b4ddaaf9fb9f183b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2000-12-06  Elliot Lee  <sopwith@redhat.com>
+       * configure.in: Detect freetype properly
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/Makefile.am:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b10aac88b3a25331abfcaa84642620ba20f62fa7..19a41dd5fdd5c7ed9b8de2e6b4ddaaf9fb9f183b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2000-12-06  Elliot Lee  <sopwith@redhat.com>
+       * configure.in: Detect freetype properly
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/Makefile.am:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b10aac88b3a25331abfcaa84642620ba20f62fa7..19a41dd5fdd5c7ed9b8de2e6b4ddaaf9fb9f183b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2000-12-06  Elliot Lee  <sopwith@redhat.com>
+       * configure.in: Detect freetype properly
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/Makefile.am:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b10aac88b3a25331abfcaa84642620ba20f62fa7..19a41dd5fdd5c7ed9b8de2e6b4ddaaf9fb9f183b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2000-12-06  Elliot Lee  <sopwith@redhat.com>
+       * configure.in: Detect freetype properly
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/Makefile.am:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b10aac88b3a25331abfcaa84642620ba20f62fa7..19a41dd5fdd5c7ed9b8de2e6b4ddaaf9fb9f183b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2000-12-06  Elliot Lee  <sopwith@redhat.com>
+       * configure.in: Detect freetype properly
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/Makefile.am:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b10aac88b3a25331abfcaa84642620ba20f62fa7..19a41dd5fdd5c7ed9b8de2e6b4ddaaf9fb9f183b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2000-12-06  Elliot Lee  <sopwith@redhat.com>
+       * configure.in: Detect freetype properly
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/Makefile.am:

diff --git a/configure.in b/configure.in
index 822bbad0735567a4aa9862cebf20e3ecda8ea0f9..23e45a791b889235a7323334b72276bb3c0b9788 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -534,11 +534,22 @@ if test "x$gdktarget" = "xlinux-fb"; then
   x_ldflags=
   x_libs=
   xinput_progs=
+
+  AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+  if test x$FREETYPE_CONFIG = xno ; then
+    AC_MSG_ERROR([*** freetype-config not found])
+  fi
+
+  FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
+  FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
+  CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
   
   AM_CONDITIONAL(USE_LINUX_FB, true)
 else
   AM_CONDITIONAL(USE_LINUX_FB, false)
 fi
+AC_SUBST(FREETYPE_LIBS)
+AC_SUBST(FREETYPE_CFLAGS)
 
 #
 # Check for Pango

diff --git a/gdk/linux-fb/Makefile.am b/gdk/linux-fb/Makefile.am
index 95c4a3079e9e5238b9a674aceaa49cb3fc3bad55..0fcdf7f0a900df868cc6a10d283cf4beb943dee0 100644 (file)
--- a/gdk/linux-fb/Makefile.am
+++ b/gdk/linux-fb/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = @STRIP_BEGIN@        \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
        -I$(top_builddir)/gdk   \
-       `freetype-config --cflags`\
+       @FREETYPE_CFLAGS@       \
        @GTK_DEBUG_FLAGS@       \
        @GTK_XIM_FLAGS@         \
        @GTK_LOCALE_FLAGS@      \
@@ -18,8 +18,8 @@ INCLUDES = @STRIP_BEGIN@      \
 
 LDFLAGS = @STRIP_BEGIN@ \
        @GLIB_LIBS@     \
-       @PANGO_CFLAGS@  \
-       `freetype-config --libs` \
+       @PANGO_LIBS@    \
+       @FREETYPE_LIBS@ \
        -lm             \
 @STRIP_END@
 

diff --git a/modules/linux-fb/Makefile.am b/modules/linux-fb/Makefile.am
index 97c0bbf44a82258d3f979bf7d866ff4ec4fdfbef..acb7579e23fc2a084cf20a7c92d0a8404f6a2542 100644 (file)
--- a/modules/linux-fb/Makefile.am
+++ b/modules/linux-fb/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = @STRIP_BEGIN@        \
        -I$(top_srcdir)/gdk     \
        -I$(top_builddir)/gdk   \
        -I$(top_srcdir)/gdk/linux-fb \
-       `freetype-config --cflags`\
+       @FREETYPE_CFLAGS@       \
        @GTK_DEBUG_FLAGS@       \
        @GTK_XIM_FLAGS@         \
        @GTK_LOCALE_FLAGS@      \
@@ -17,8 +17,7 @@ INCLUDES = @STRIP_BEGIN@      \
 LDFLAGS = @STRIP_BEGIN@ \
        @GLIB_LIBS@     \
        @PANGO_CFLAGS@  \
-       -L/gnome2/lib   \
-       `freetype-config --libs` \
+       @FREETYPE_LIBS@ \
        -lm             \
 @STRIP_END@